From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 21 Jun 2011 16:48:33 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1165^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8462fc0ce20cc1caf883996d193d1cd2c1629498;p=emacs.git

Merge from trunk.
---

8462fc0ce20cc1caf883996d193d1cd2c1629498